From 2502c01d7eb704473e2d5f3d4c903ebabe75f3a8 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 28 Feb 2018 17:37:57 +0000 Subject: [PATCH] debian-hardened-buildflags-no-LO-fstack-protector-strong don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the hardening flags from dpkg-buildflags anyway. Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff --- config_host.mk.in | 1 - configure.ac | Bin 450328 -> 449916 bytes solenv/gbuild/platform/com_GCC_defs.mk | 6 ------ 3 files changed, 7 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index 768d6271aa7..7907a26f8d1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -233,7 +233,6 @@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export USING_X11=@USING_X11@ export HAMCREST_JAR=@HAMCREST_JAR@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ -export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@ export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@ diff --git a/configure.ac b/configure.ac index 3b4ccd54cc6b1d2e234c61c99ca682e83fb5fada..3286fdd02875172b62abf2cc1d35d5da52abf094 100644 GIT binary patch delta 33 mcmbQSPx{X;>4p}@7N#xC;XLi1d6|Kj1&CR4p}@7N#xC;XKm1X~iXp$=SLEMfoME$tC$ky2T|$`FZKFnq1TQSeay| zYj875isMi;oqs2z`t%E-%u3S1A&$=8@c}{pA+F9L{z37K?Pk=T m9v8;UEs9mu^n-7irKUSDG3B&}^DqN33lOtz59eW1y$AraSvlbV diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 1a6eebe7f45..c0575d512ab 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -113,12 +113,6 @@ endif gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) -ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE) -gb_CFLAGS_COMMON += -fstack-protector-strong -gb_CXXFLAGS_COMMON += -fstack-protector-strong -gb_LinkTarget_LDFLAGS += -fstack-protector-strong -endif - ifeq ($(ENABLE_PCH),TRUE) ifneq ($(COM_IS_CLANG),TRUE) gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch -- 2.30.2